CDRIVER-748 fix mock server for TSAN#620
Merged
kevinAlbs merged 2 commits intomongodb:masterfrom May 29, 2020
Merged
Conversation
mock_server_hangs_up and mock_server_resets were closing a request stream directly from the main thread. But a request stream should only be accessed by the worker thread. This now adds a special reply to the worker thread's queue to signal a hangup or reset.
kevinAlbs
commented
May 25, 2020
| mongoc_stream_close (request->client); | ||
| reply = bson_malloc0 (sizeof (reply_t)); | ||
| reply->type = HANGUP; | ||
| q_put (request->replies, reply); |
Collaborator
Author
There was a problem hiding this comment.
The behavior of mock_server_hangs_up was to close the server side stream from the main thread. TSan flags a data race because in the process of closing, it overwrites the stream's file descriptor with an invalid one, causing a write/read race.
The mock server maintains a worker thread for each server-side connection. And each worker thread maintains a thread-safe queue for sending replies back. So instead of closing the stream directly, this pushes a special reply onto the queue to signal the worker thread to close the stream.
kevinAlbs
added a commit
that referenced
this pull request
May 29, 2020
mock_server_hangs_up and mock_server_resets were closing a request stream directly from the main thread. But a request stream should only be accessed by the worker thread. This now adds a special reply to the worker thread's queue to signal a hangup or reset.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is not urgent. This, and some other test fixes from #607 are prerequisites for adding a thread-sanitizer task to evergreen to automatically check for thread related bugs.
mock_server_hangs_up and mock_server_resets were closing a request stream directly from the main thread. But a request stream should only be accessed by the worker thread. This now adds a special reply to the worker thread's queue to signal a hangup or reset.